4154db68c35371e9a7f61bee666fff7a2ddb1c8a,icy/roi/ROI4D.java,ROI4D,contains,#ROI#,217
Before Change
// same position ?
cok = (c == -1) || (c == roi4d.getC());
return cok && getBooleanMask(false).contains(roi4d.getBooleanMask(false));
}
// use default implementation
After Change
if (onSamePos(roi4d, true))
{
// special case of ROI Point
if (roi4d.isEmpty())
return contains(roi4d.getPosition4D());
BooleanMask4D mask;
BooleanMask4D roiMask;
// take content first
mask = getBooleanMask(false);
roiMask = roi4d.getBooleanMask(false);
// test first only on content
if (!mask.contains(roiMask))
return false;
// take content and edge
mask = getBooleanMask(true);
roiMask = roi4d.getBooleanMask(true);
// then test on content and edge
if (!mask.contains(roiMask))
return false;
// contained
return true;